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