Refs #9714 two doc tests
Merge branch 'feature/9714_doc_tests' into develop