[DF-3324] fix for flags
Merge branch 'origin/development'