Merge master updates into eval branch

Merged Maximilian Schanner requested to merge master into eval

Merge request reports