HPCC-9419 WIP4

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