merge 3.5 (closes #27968)