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