Merge "Snap for 8466163 from 1fa0ab2c50d5db19145b8aa88df52805d6f24fb4 to main-cg-testing-release" into main-cg-testing-release