resolve crush bug due to empty OAuth2 access token
Merge