Closes #29177: Merged fix from 3.6.