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