update request_token callback logic
Merge branch 'daiwei' into develop
Merge branch 'develop'