Apply new changes to 0.2 release branch

Merge request reports

Loading