Merge "Snap for 8559592 from 35d0e6201decaebfd414e3fa2bc6c60668f5f7e1 to main-cg-testing-release" into main-cg-testing-release