Merge 12.1.6

Merged Piotr Gawron requested to merge merge_12.1.6 into master

Merge request reports