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