Merge branch 'master' into 328630-canonical-uris