merge 3.3 (closes #22518)