Merge "Snap for 8580505 from bb7d8dc8d0d2be62dbe8d5b7bafdc3af7d6fd8e8 to main-cg-testing-release" into main-cg-testing-release