Merge branch 'new-fe-options' into 'develop'