Closes #19523: Merged fix from 3.3.