Devel 16.0.x

Merged Piotr Gawron requested to merge devel_16.0.x into master

Merge request reports