HPCC-9419 WIP2

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