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