HPCC-12325 (based off of 12320 branch)

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>