Merge branch 'upstream-main' into feature/msk-skills

# Conflicts:
#	cloudformation/devops-agent-skill-policies.yaml