Merge remote-tracking branch 'origin/main' into...

Merge remote-tracking branch 'origin/main' into 585-masa-2tc-dtx-to-ext-output-has-transition-artifacts