Merge tag 'v3.10.96' into update