Merge branch 'chore/docs-update' into 'develop'