Merge origin/dev into fix/lsp-dead-root-prune