Merge "Fixing up the encoding of the BCC"