Sync Dev and Master

Agustin Panerequested to merge
dev into master

Merge request reports