Merge "Snap for 8029350 from dd6d9f9f6c9d095bd159d4f0d8b36a6b7e6057a8 to main-cg-testing-release" into main-cg-testing-release