Closes #21709: Merged fix from 3.4.