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