Merge "Snap for 7789152 from 939353e1e3f8d21ad65b95f6187ac398e3291504 to main-cg-testing-release" into main-cg-testing-release