7 Commits (renchuhao_branch)