Merge tag 'v3.10.80' into update