Closes #22776: Merged fix from 3.4.