Merge 3.2 closes #12510