Merge tag 'v3.10.58' into update