Closes #25411: Merged fix from 3.4.