Closes #20160: Merged fix from 3.5.