Merge 16.2.7

Merged Piotr Gawron requested to merge merge-16.2.7 into master

Merge request reports