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