Merge branch 'remitamine-baidu'