HPCC-11919 Changes submitted by Fishbeck

Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>