Merge "Snap for 7705446 from 7e8a9d9f339554bb97406bdbaef804b2ca9aded3 to main-cg-testing-release" into main-cg-testing-release