Merge branch 'feature-docs' into develop