Merge "Enable a uuid flavor"