Closes #29213: Merged fix from 3.6.
2 files changed