merge master into local_models

Merged Maximilian Schanner requested to merge master into local_models

Merge request reports