octopus-merge (part 4: rewrite tracking in plumbing)

octopus-merge (part 4: rewrite tracking in plumbing) #2015