[DF-3254] rename flags
Merge branch 'origin/development'