Another merge of the lsp tooling branch into the dev branch.
tooling
dev
All changes are restricted to tools/lsp.
tools/lsp