• Backport of gh-29790

Comment From: sbrannen

This has been merged into 5.3.x in 07fd7606e73bf60f23b21b0e5399e331175f3b90 and revised in 6bd7a7321e78878d5888930ab39c71162d045f16.