modified validation to handle compound unique indexes
Merge branch 'uniqueIndexHandling' into dev