Merge remote-tracking branch 'remotes/origin/main' into 387-ism-metadata-discontinuity-in-fec