[Proposal] Backport GEODE-8671 to 1.14.x, 1.13.x and 1.12.x branches

[Jianxia Chen]

I would like to backport the fix of GEODE-8671, currently a 1.14 blocker,
to support/1.14, support 1.13 and support/1.12. This would help avoid Pdx
corruption.

Thanks,
Jianxia