Merge "Snap for 8294919 from 748e557b14e9c9cab834ddf5880e2f4a7a003ef2 to main-cg-testing-release" into main-cg-testing-release