refs #9778 missing changes lost extracting code changes from #9769