merge 3.4 (closes #22518)