Merge tag 'v3.10.69' into update