Merge "Snap for 7725314 from 237ec60d0b9a87b0a4d8829152efeca24c13003b to main-cg-testing-release" into main-cg-testing-release