Merge remote-tracking branch 'origin/main' into 382-potential-masa-metadata-framing-asynchrony