Merge "Add async version of "uncanonicalize""