Update the UUIDs
New UUID updates.
Merge branch 'master' into develop

* master:
  New UUID updates.
  Update the UUIDs