Closes #29132: Merged fix from 3.6.