Merge 12.1.1 into master

Merged Piotr Gawron requested to merge merge into master

Merge request reports