Merge 12.2.1

Merged Piotr Gawron requested to merge merge-12.2.1 into master

Merge request reports