Merge "Snap for 8496002 from 45fbf11f45be1e144fe59a8d9ce5d613afd1f913 to main-cg-testing-release" into main-cg-testing-release