Closes #12906: Merged fix from 3.2.