Takes channels taken into account for waffles
auto-merge staging into master