Merge "Snap for 8559592 from 37a5303642a7779c80f236e54bcbb61c6419b55b to main-cg-testing-release" into main-cg-testing-release