Merge branch 'feature/fe-configuration' into 'develop'