Merge remote-tracking branch 'origin/main' into 1845-decoder-crashing-with-rateswitch-and-omasa-ext