Xtream tracking PR

cosmetic tracking PR to follow the xstream branch