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