merge 3.2 (closes #13908)