Closes #21742: Merged fix from 3.4.