Dev

Merged Alexander Khromov requested to merge dev into master

Merge request reports