merge 16.2.1 into master

Merged Piotr Gawron requested to merge merge-16.2.1 into master

Merge request reports