Merge 16.2.6

Merged Piotr Gawron requested to merge merge-16.2.6 into master

Merge request reports