Merge branch 'basop-ci-branch' into basop-ci/add-commandlines-to-regression-check-output