Merge "Snap for 8466163 from da34a761a17688d7329799a1d869064e25018c9d to main-cg-testing-release" into main-cg-testing-release