* all:
  - Update URI ids.
Merge branch 'master' into develop