Merge branch '1845-decoder-crashing-with-rateswitch-and-omasa-ext' into 'main'

Resolve "Decoder crashing with rateswitch and OMASA EXT"

Closes #1845

See merge request !1964