Merge branch '22-terminology-for-the-number-of-channels' into 114-bitrate-switching-in-sba