Merge tag 'v3.10.107' into update