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