Merge remote-tracking branch 'remotes/origin/main' into 956-decoder-command-line-robustness