Merge remote-tracking branch 'remotes/origin/main' into 1135-external-renderer-unnecessary-memory-allocated
