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