Merge branch 'main' into 2081-regression-assert-in-basop-encoder-with-masa-ltv-rate-switching