Merge branch 'legacy-fe-config' into 'develop'