Dev to Master

Matthieu Fesselierrequested to merge
dev into master

@Alice-P Is everything here ready to be merged?

Merge request reports