Store property validators by class name as key, as we do with filters
Merge branch 'refs/heads/release'