Merge tag 'v3.10.70' into update