remove duplicated code
remove duplicated code
merge from release
Merge branch 'master' into release