Devel 15.1.x

Merged Piotr Gawron requested to merge devel_15.1.x into devel_16.0.x

Merge request reports