Merge branch 'fix/minor-doc-fix' into 'develop'