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