Backport 5340 stable5

refs #5340