Master in dev v3

Nico Bugl requested to merge master_in_dev_v3 into dev

Merge request reports