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