Merge branch 'validation'
Added validator reference
Reverted broken test
Merge branch 'master' into validation