This is just a rebase to tip:perf/core. No logic changes since v4 (which Namhyung reviewed).Had to resolve some merge conflicts with the sort__branch_mode. -Arun