Merge "Snap for 8029350 from d1ecad2da34e5b4021fb905c9729072a341cd9fe to main-cg-testing-release" into main-cg-testing-release