Dev fix dev

Nico Bugl requested to merge dev_fixDev into dev

Merge request reports