Merge branch 'upstream-fixes'