Merge "Fix typo nbChannels -> channelMask"