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