Merge master into feature/flare-mega (aws#7393)

## Automatic merge failed

- Resolve conflicts and push to this PR branch.
- **Do not squash-merge** this PR. Use the "Create a merge commit"
option to do a regular merge.

## Command line hint

To perform the merge from the command line, you could do something like
the following (where "origin" is the name of the remote in your local
git repo):
```
git stash
git fetch --all
git checkout origin/feature/flare-mega
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/flare-mega
```

---------

Signed-off-by: nkomonen-amazon <[email protected]>
Co-authored-by: Nikolas Komonen <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: opieter-aws <[email protected]>

Author: 3 people