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