Merge "Add basic support for Uri canonicalization" into klp-dev