Closes #17744: Merged fix from 3.3.