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