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