7.x sp inline datastream formatting

Plus other stuff that's not in the release branch.