Merge branch 'master' into idempotent_updates
setApiKeyAttribute now works as expected
Merge remote-tracking branch 'upstream/idempotent_updates' into idempotent_updates