Merge changes from topic "c2_channel_mask" into tm-dev

* changes:
  C2: channel mask mapper
  C2: add support for channel mask