8 Commits (xiaojinfei-patch-3)