12.0.1 into master

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

Merge request reports