Merge branch 'main' into basop-2317-msan-use-of-uninitialized-value-in-masa-dtx-encoding