From 35b9e1944721c2380d206f2a2f04d27abaf9cbac Mon Sep 17 00:00:00 2001
From: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Date: Wed, 20 Mar 2024 10:32:04 -0700
Subject: [PATCH] Backport/backport 878 to 2.13 (#880)

Signed-off-by: Riya Saxena <riysaxen@amazon.com>