Merge branch 'main' into feature/use-dllimport-generator