Bugfix and updates to dev

Merge request reports

Loading