Merge "[Safer intents] Credentials" into main