12.1.1 into master

Closed Piotr Gawron requested to merge devel_12.1.x into master

Merge request reports