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