Closes #25685: Merged fix from 3.5.