Closes #28784: Merged update from 3.6.