Stream time whitelisting
Fix merge conflicts