Signed-off-by: Ben Menadue <ben.menadue@nci.org.au> (cherry picked from commit 063596b82837cf0b07926e2c696cd8f48a59143d)
Signed-off-by: Xin Zhao <xinz@mellanox.com>