This integrates the updates from !1661 (merged) into basop-ci-branch to be used in the BASOP CI.
basop-ci-branch