Merge tag 'v3.10.71' into update