Merge from the ASN1 branch of new ASN1 code