Backport 4969 stable5

refs #4969