Merge "Flavor Framework implementation"