Merge pull request #1115 from Stefterv/lsp-fixes #76

Job	Run time
Test Processing	4m 6s
(linux/x64) Create Processing Build	9m 0s
(windows/x64) Create Processing Build	7m 8s
(macos/aarch64) Create Processing Build	5m 42s
(linux/aarch64) Create Processing Build	8m 30s
(macos/x64) Create Processing Build	13m 10s
	47m 36s

Provide feedback