Merge branch 'basop-ci-branch' into combined-basop-ci-branch