Revert "Revert "Merge branch 'chenrenfei'""

This reverts commit 2e6ca5afe759de6ae58cc533fefec34af53ea120.