Merge pull request #7892 from remitamine/livestream