Merge branch 'upstream-tweaks'