Merging The UUID-Changes

Since I totally forgot about working on a branch,
let's bring this all up to master.