HPCC-10988 WIP

Signed-off-by: Kevin Wang kevin.wang@lexisnexis.com