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