Closes #16519: Merged fix from 3.3.