add uuid
Merge branch 'uuid'