Syncing Main With M23 Release Changes

Addresses critical vulnerability: https://community.opengroup.org/osdu/platform/deployment-and-operations/terraform-deployment-aws/-/security/vulnerabilities/28353