Add UUID asserts
Merge branch 'uuid-validator'