Merge "Easier ftl::Flags construction" into main