Merge 16.0.7

Merged Piotr Gawron requested to merge merge-16.0.7 into master

Merge request reports