Yiming's features implemented.
Merge branch 'yiming'
Merge branch 'master' into buildTest