Merge "Snap for 7810574 from 29aa94d12528701b7008e241e6acc2e5d1d6a127 to main-cg-testing-release" into main-cg-testing-release