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