Merge branch 'main' into kiene/add-command-lines-to-renderer-test-logging