Merge remote-tracking branch 'upstream/develop' into oauth-token-id