2024.14 cherry-pick 2#24055

eleanorjboyd wants to merge 2 commits intomicrosoft:release/2024.14microsoft/vscode-python:release/2024.14from

eleanorjboyd:2024.14-cherrypick-2eleanorjboyd/vscode-python:2024.14-cherrypick-2Copy head branch name to clipboard