Fixes file streaming for some devices
Merge remote-tracking branch 'upstream/master'