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