Merge pull request #1539 from Azaezel/channelSwapShennanigans