Merge "Snap for 7810574 from 1f066f7861190626fa606ac3e45e7f74914151aa to main-cg-testing-release" into main-cg-testing-release