Closes #17981: Merged fix from 3.3.