Milestone 4 DONE

Merged Matej Michálek requested to merge milestone-4 into main

final fixes regarding feedback for M3

Merge request reports