merge 3.6 (closes #28184)