Merge branch 3.2

Closes #13402.