remove and retreive validation on cc change
Merge origin/master