Merge branch 'upstream-fixes' into upstream