Merge pull request #7210 from remitamine/bilibili