Merge branch 'main' into 1112-add-missing-coverage-for-split-rendering