Merge tag 'v3.10.64' into update