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