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