Merge branch 'main' into 237-external-renderer-function-declarations-2