Merge tag 'v3.10.106' into update