Merge "FTL: Pull Flags into namespace" into tm-dev