Merge branches 'return-testresult' and 'upstream-picks'