Merge branch 'main' into template-string-inference-2789