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