Backport 6675 stable6

refs #6675