Merge "Snap for 7746340 from 3275d3eeecca828199774fb0805ab19a9009c7c6 to main-cg-testing-release" into main-cg-testing-release