Merge branch 'basop-ci-branch' into ci/add-prm-file-for-basop-encoder-tests