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