Merge branch 'chore/update-config-fe' into 'develop'