9 Commits (bugfix/zhy_visit)