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