[-TASK] Refactored Import of Entity Types
Merge remote-tracking branch 'origin/master'