Merge branch 'main' into ci/adapt-first-frame-is-sid-test-for-basop