Closes #17290: Merged fix from 3.3.