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