[BASOP-CI] (Hopefully last) Synch main -> basop ci branch

Apply outstanding missing changes from main to baosp-ci-branch

Companion MR in CI repo: ivas-codec-ci!57 (merged)