Merge "Snap for 8580505 from f2f591ed3540d4dcb55cc2b1a53d919923c84e3c to main-cg-testing-release" into main-cg-testing-release