Closes #13361: Merge fix from 3.2.