merge latest develop

Merged Sebastian Müller requested to merge develop into riv_temp_module

Merge request reports