modify stream for support old tracking condition
modify stream support old condituin
Merge branch 'issues02' into develop