merge 3.4 (closes #26478)