Merge branch 'main' into ci/add-missing-commandline-logging-in-tests-i-am-looking-at-you-split-rendering
