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