Integrated validation
Merge remote-tracking branch 'origin'
Almost integrated label section
Fixed conflicts
Replaced List with Set