Dev to Master

Rendon Arango, Simonrequested to merge
dev into master

Update master to the last working version

Merge request reports