Cleanup/comp flash

Merged Kilian Weishaupt requested to merge cleanup/comp-flash into master

Merge request reports