Merge "Snap for 8294919 from 662cb7088988044bed1c5315309b1ba8bf360128 to main-cg-testing-release" into main-cg-testing-release