1071418 refactor importer

Thomas Bindhammer requested to merge 1071418_RefactorImporter into upgrade/2021.0.0

Merge request reports