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