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