Merge branch 'api-docs-fixes' into 'develop'