Merge branch 'chore/update-fe-settings-and-docs' into 'develop'