Sprint s04 v2

Nico Bugl requested to merge SprintS04-V2 into dev

Merge request reports