Release/v1.2

Praetorius, Simonrequested to merge
release/v1.2 into dev

Merge changes of latest release into develop branch, to be up-to-date with the master

Merge request reports