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