Merge "Snap for 8547012 from 864034bf750090c0522ba6a3cd1abb379999ba6e to main-cg-testing-release" into main-cg-testing-release