Merge "Snap for 8132946 from 8a39031f535b2365f6b852e013af44863f5f5684 to main-cg-testing-release" into main-cg-testing-release