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