Dmitriy/Import context refactoring

Andrey Veltischev requested to merge dmitriy/upgrade_performance into master

Merge request reports