Backport of gh-27772

Comment From: jhoeller

Closing this backport ticket since there does not seem to be an easy regression fix to apply, at least not for 5.2.x.