12.1.3 into master

Merged Piotr Gawron requested to merge merge-12.1.3 into master

Merge request reports