Closes #25185: merged fix from 3.5.