Merge branch 'main' into fix-large-renderer-delay-comp-2