"Flags" app module
Merge branch 'flags' into addons