Merge remote-tracking branch...

Merge remote-tracking branch 'origin/655-wmc-header-missing-in-ivas_omasa_dec-c' into 656-masa-rate-switching-with-jbm-crashes-in-smoke-test