Closes #20242: Merged fix from 3.3.