Update branch

Boris Budinirequested to merge
master into dev

Merge request reports