Fixing the failed cases for datastream class
Merge branch 'featureOM' into develop
Fixing that failed test cases