Backport 6693 stable6

refs #6693