Merge "Snap for 7768542 from be17619cccc161a48a9bcf7b03384c32e13492db to main-cg-testing-release" into main-cg-testing-release