Merge branch '3.2'

Closes #8033.