[PROPOSAL] backport fix for GEODE-8919 to 1.14.0

[Ernie Burghardt]

I would like to include the change for GEODE-8919 to 1.14.0, it is a valuable 
and low risk change.

Thanks,
EB