Merge "Snap for 7362692 from 5426122b9b68c0dfadfdc44295f8e20b4d022ab9 to main-cg-testing-release" into main-cg-testing-release