7 Commits (lixihang_branch)