Merge branch 'main' into 1052-sba-decoder-confused-with-ext-output