Closes #13807: Merged fix from 3.1.