Work in progress: Added small implementation of the feature flag into th...

...e stream view
I would reduce this to 60 seconds in production.