Merge pull request #9870 from annando/uri-id