Revert "Merge branch 'streamer-refactoring' into 'develop'"