Merge branch 'merge-with-uritemplate'