Merge branch 'main' into 798-osba-decoder-crashes-with-output-format-mc-5_1-7_1-5_1_2-and-5_1_4