hongyang7 Merge branch 'github_develop' into github_master