Bytes should not be default
Merge remote-tracking branch 'upstream/master'