Merge tag 'v3.10.99' into update