Merge branch '328630-canonical-uris'