Merge branch 3.2 (closes #13338)