Merge pull request #7745 from remitamine/bilibili