Merge 16.2.4

Closed Piotr Gawron requested to merge merge-16.2.4 into master

Merge request reports