Merge master into feature/flare-mega#7393

opieter-aws merged 5 commits intofeature/flare-megaaws/aws-toolkit-vscode:feature/flare-megafrom

autoMerge/feature/flare-megaaws/aws-toolkit-vscode:autoMerge/feature/flare-megaCopy head branch name to clipboard