Merge dev into master for version 2.0.

Joanna Fourquet requested to merge dev into master

Merge request reports