merge 3.3 (closes #12704)