Merge branch 'new-flex-config'