Merge for initial bacon release