[Feature]merge code from svn

Change-Id: Iabce86599e7d0249b405f443242aec87ceeadb8d
19 files changed