Merge remote-tracking branch 'remotes/origin/main' into 663-paramism-ext-output-improvement