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