Merge tag 'upstream/2.10_beta2+ds'