Merge "Snap for 7664297 from c1c2b4f8168c4683dcd94fef13d7abf0f7a6abf1 to main-cg-testing-release" into main-cg-testing-release