Signed-off-by: Mikhail Brinskii <mikhailb@mellanox.com> (cherry picked from commit d81dc533f6f7ebba0b00c1652190975f0aca9e06)