Merge "Snap for 8294919 from 2d8e5e0ab8954d9bbfae4b437e4513e21aad5103 to main-cg-testing-release" into main-cg-testing-release