Fix key name to store uuid
Merge branch 'dev'