Merge tag 'upstream/2.10_beta1+ds' into experimental