Merge "Snap for 8294919 from f0864470681d42ea290d36e5134824f7f5fe3628 to main-cg-testing-release" into main-cg-testing-release