Merge branch 'fix-docs-formatting' into 'develop'