Don't share waffles by connections
auto-merge staging into master