Merge "Snap for 8294919 from 05e8cf4309eb0db437736f99372038661f2ada7c to main-cg-testing-release" into main-cg-testing-release