Merge remote-tracking branch 'origin/main' into output-history