Merge branch 'main' into basop-2598-harmonize-tcx_arith_decode_envelope