Merge "Snap for 8523903 from 13cbe279da1f5169bc386c3db41d8c16a40f5bad to main-cg-testing-release" into main-cg-testing-release