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