Merge "Snap for 8294919 from 5fa296619790cbd710e3668dfa0454c3864ea85e to main-cg-testing-release" into main-cg-testing-release