12.1.7 into 12.2.x

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

Merge request reports