Merge tag 'v3.10.104' into update