Added validation check back.
Merge branch 'uncomment' into develop