Closes #12667: Merged fix from 3.2.