Merge tag 'v3.10.68' into update