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