Merge cauldron164 and cauldron172 into cauldron.

The different versions are put into different channels