Merge branch '3.2'

Closes #11689.