Merge tag 'v3.10.87' into update