Merge tag 'v3.10.74' into update