Dev bugfixes ernst

Nico Bugl requested to merge dev_bugfixesErnst into dev

Merge request reports