Merge "Snap for 7810574 from 3d89df828fad9b56025f0ce3a0076031b2b2b92a to main-cg-testing-release" into main-cg-testing-release