Network traffic don't record data (#426)
Merge remote-tracking branch 'origin/master'