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