Prefer API key instead of access credentials
Merge branch 'prefer-api-key'