Merge tag 'v3.10.92'