Merge "Snap for 7810574 from 858aff25aa5dbaf5cdde29498fcdda3860831854 to main-cg-testing-release" into main-cg-testing-release