Closes #21172: Merged fix from 3.4.