Merge "Snap for 8364388 from cfb6d26e9a1b99a36437749725b14f7ac75e1f5d to main-cg-testing-release" into main-cg-testing-release