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