Molart changes

Merged Piotr Gawron requested to merge molart-changes into devel_12.2.x

Merge request reports