Backport 5340 stable5

refs #5340 

pull request submitted due to criticality and merge conflicts