3 Commits (wangkai_branch)