Merge "Snap for 8400509 from fec253b8291c56fdb4a4e7c7389bc36601f986fb to main-cg-testing-release" into main-cg-testing-release