Merge branch 'main' into 1264-json-output-does-not-output-in-original…

Merge branch 'main' into 1264-json-output-does-not-output-in-original… #1550