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