added is_flex settings
Merge branch 'dev'