HPCC-9347

WIP

Fixes HPCC-9347

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>