Sync Data.ByteString with stable branch