Patches from regression tests

Christian Gutschowrequested to merge
cg_validation into release-4-1-x

cf. title

Merge request reports