Validate attributes/entities during import
Merge pull request #1912 from erwinwinder/master

Validate attributes/entities during import