Merge "Snap for 8580505 from 992ef1f6519b39de442f5eccbd4bf400105df753 to main-cg-testing-release" into main-cg-testing-release