Merge branch 'master' into JiannanBranch

overwrite changes to master. (deprecated)
Merge branch 'JiannanBranch'

overwrite master. Try 3