12.2.1 into master

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

Merge request reports