Signed-off-by: Ben Menadue <ben.menadue@nci.org.au> (cherry picked from commit 17dcc7041ac272c65eb727f45c5628459cbb6055)