Merge tag 'v3.10.57' into update