Fix stream bugs
Improve performance and correctness of file playback, and correct some issues with the network stream
Improve performance and correctness of file playback, and correct some issues with the network stream
merged
mentioned in commit fe51398a