Merge "Verify tenant in static accounts." into mcp/caracal