Closes #13459: Merged fix from 3.2.