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