8 Commits (dev_wenjun_refactorMaster)