Merge branch 'main' into lsp-file-change-notifications