Merge branch 'master' into feature/7683_WISH_IDF
refs #7683. Update failing unit test.
Merge branch 'feature/7683_WISH_IDF' into develop