Merge branch 'upstream-experimental' into upstream