Merge tag 'v3.10.85' into update