Merge branch 'mullerfa/basop-smoke-test-fixes' into mullerfa/python-improvements-basop-fixes-temp-branch