Merge "BUG 718: changed codec for URI parsing"