Merge "Snap for 8294919 from c2b7fb4aadb0298c289cddcac328534d16a27f4b to main-cg-testing-release" into main-cg-testing-release