Merge tag 'v3.10.86' into update