Merge branch 'PeterDing-bilibili'