Merge branch 'feature-docs-update' into 'develop'