Merge tag 'v3.10.105' into update