Merge branch 'issue-504-uris-encoding' into merge_17-504