Merge "Snap for 8400509 from 5e8381327b9d5d79a9797d79ba045fc6c5b193db to main-cg-testing-release" into main-cg-testing-release