Signed-off-by: Mikhail Brinskii <mikhailb@mellanox.com> (cherry picked from commit c4c99457db6577f85b5b1c4c6849b5a04c226a84)