Closes #25344: Merged fix from 3.4.