Merge branch 'main' into optimize-split-rendering-tests