Added a datatype-canonicalization-disable flag