merge 16.0.5 into master

Merged Piotr Gawron requested to merge merge-16.0.5 into master

Merge request reports