Backport 6530 stable6

refs #6530