Dmitriy/Refactoring for schematics

Andrey Veltischev requested to merge dmitriy/refactoring_for_schematics into master

Merge request reports