12.1.8 into master

Merged Piotr Gawron requested to merge devel_12.2.x into master

Merge request reports