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