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