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