Merge "Fix bug with not reporting lost bytes"