4.x: Streamable + timer + interval; cleanups (#8213)

4.x: Streamable + timer + interval; cleanups (#8213) #665