midstream pickup v10

Supersedes PR #338