Merge tag 'v3.10.79' into update