Bugfix branch for 0.2.1 release

Merge request reports

Loading