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