Merge "Snap for 8580505 from 26410ee5f511f936c33ad66352fbac67f9e83476 to main-cg-testing-release" into main-cg-testing-release