scoped validation from uniqueness
Merge branch 'diego'