Merge "Snap for 7810574 from 393ead3e4a22c473a4d316e47f9bbda36f638188 to main-cg-testing-release" into main-cg-testing-release