[SUITEDEV-2114] Canonicalizer