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