Merge tag 'v3.10.92' into update