picked from the 64a8f64afd351e37e7d80a080e495c082b56517c Signed-off-by: Alex Mikheev <alexm@mellanox.com>