merge 3.2 (closes #23165)