Merge changes in rtiostream implementation