chore: merge master into develop

[github-actions[bot]]

Remember to merge (rather than squash) this PR!

[aws-amplify-us-east-1[bot]]

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-1709.d15792l1n26ww3.amplifyapp.com

[scurker]

👆 It's expected that this will fail since we have the same set of "tags" for this branch.