Re #744 Add a uniq validation