Merge "Snap for 8433432 from 5b89f2099015884648bf562666b8bea0c2071c5c to main-cg-testing-release" into main-cg-testing-release