Closes #17540: Merged fix from 3.3.