Rename of flags
Merge branch 'dev'