HPCC-12311 WIP

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