Issue link: https://read.uberflip.com/i/1463871
© 2021, Amazon Web Services, Inc. or its Affiliates. Fix and why it's important https://go.aws/3IwHNTR
