[SD] modify code
Merge branch 'local'