add some modified for version 2.0
Merge remote-tracking branch 'origin/develop_version_2.0' into develop_version_2.0