Branched documentation improvements from develop
Merge doc hotfix to develop