Support for canonicalization
Merge