Merge "Snap for 8294919 from 9166a73d13edccded8ccc7141fe2da85e40f9a4a to main-cg-testing-release" into main-cg-testing-release