Merge "Fill *_id information for client when using static accounts" into mcp/caracal