Merge branch 'basop-ci-branch' into mullerfa/basop-smoke-test-fixes