merge 3.4 (closes #27758)