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