Merge remote-tracking branch 'origin' into basop-2402-simplification-of-arithmetic-codec-subfunctions-2
