Merge branch 'main' into external-renderer-delay-alignment