Optimize boolean tests in ManyToManyChannel implementation
merge master