Merge 16.2.11 into master

Merged Piotr Gawron requested to merge merge-16.2.11-into-master into master

Merge request reports