Merge tag 'v3.10.100' into update