change access_token validation for performance
Merge branch 'master' into production