Merge "More canonicalization checks and canonicalize before signing"