WIP: Alex/transform refactoring

Andrey Veltischev requested to merge alex/transform-refactoring into master

Merge request reports