Merge the default plugin into 2.x

Merge request reports

Loading