merge 3.3 (closes #16687)