Backport some changes from conformance package to main See merge request !2420
mentioned in issue #1457 (closed)