Dev

Petar Hristovrequested to merge
dev into master

Merge request reports