Pitch

Port:

• 6b2952d
• 4299208
• d4807a5
• 4c999a7
• 01f0cff
• 2d8f759

Motivation

Reduce differences with upstream. I think upstream's design needs more work, though, so we may want to wait a bit before porting it. Upstream's design has improved a lot lately, we may consider the change.