improve performance
build
Merge branch 'master' into deferred-promise
build