Merge "Snap for 7810574 from c2b92f2ff59f3a6aaff685723bc6772abad72c3a to main-cg-testing-release" into main-cg-testing-release