UUID support
Merge branch 'dev'