Merge "Snap for 7810574 from adddffd5e296d4ce5cad8dd5bcfab4c80f1e17af to main-cg-testing-release" into main-cg-testing-release