chore: merge main to develop (#3947)
chore: merge main to develop (#3947)


forcedotcom/salesforcedx-vscode,forcedotcom/salesforcedx-vscode,forcedotcom/salesforcedx-vscode,forcedotcom/salesforcedx-vscode