Merge Qiuhua's master