Flag working
Merge branch 'release/flag'