[livestream] Improve extraction (Closes #3513)
Merge remote-tracking branch 'upstream/master' into ronn

Pulling changes from upstream