Merge 12.1.8

Placeholder Piotr Gawronrequested to merge
merge-12.1.8 into devel_12.2.x

Merge request reports