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