merge bugfix into martin

Merge request reports

Loading