Closes #19349: Merged fix from 3.3.