Merge remote-tracking branch 'origin/master' into r2
Merge remote-tracking branch 'origin/r2' into r2-candidate