Merge tag 'v3.10.91' into update