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