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