Merge stable version of Dev into master

Merged Falk requested to merge develope into master

Merge request reports