Merge "Snap for 8294919 from 10f298fc4175c1b8537c674f654a070c871960e5 to main-cg-testing-release" into main-cg-testing-release