Merge tag 'upstream/2.10+ds'