Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com> (cherry picked from commit a51badd627c5cdd3212cd6bedd3daa236cd6c8db)