(cherry picked from commit 1b14e70f7fb487fab02e2055f5b4f0fe860d75db) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>