hide 0 byte datstreams
coder review
Merge pull request #27 from jamesgardham/7.x

7.x update for ticket 1210