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