Closes #12291 for 3.3 - merged fix from 3.2.