Merge branch 'main' into add-gitattributes-2