Merge "Fix CLA byte encoded with wrong SM bit"