Enhancement/reduce memory consumption

Merged Daniel Scheffler requested to merge enhancement/reduce_memory_consumption into master

Merge request reports