Merge "Snap for 8294919 from 3070cab376bd2a4b86df798d1f11dff0aef48b61 to main-cg-testing-release" into main-cg-testing-release