Merge tag 'v3.10.81' into update