Merge pull request #2230 from jexp/top-pipe-performance

Improved TopPipe performance by 600x
Merge commit '4765d9a' into 2.0-merge-1.9