merge 3.5 (closes #26478)