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