Merge branch 'feature_zhou' into feature_li
paperclip