Merge "Snap for 8366858 from caaa4506fde57126ff4488a26866e370e772d66d to main-cg-testing-release" into main-cg-testing-release