Merge "Fix for private flavor list"