Closes #17743: Merged fix from 3.3.