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