Merge tag 'upstream/2.11_beta1+ds'