XBT is self descriptive, and new mainline client  #5711