HPCC-11958 WIP

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