Merge "Snap for 7810574 from 6a77b078579953412d229b1e2bd3936664411edf to main-cg-testing-release" into main-cg-testing-release