Merge "Add async version of "canonicalize""