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