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