Merge remote-tracking branch 'upstream-repo/master' into upstream