[s2p] merged XB-pointstream addition by Gabriele