Merge commit 'refs/pull/66181/head' of github.com:microsoft/vscode into pr/66181