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