Merge "Snap for 8294919 from 0810415273f9488b782e5595fe68d5516a6b5e4c to main-cg-testing-release" into main-cg-testing-release