Revert "feat: add access_profile_id to virtual keys for direct access profile assignment (#3560)"

[BearTS]

Summary

Briefly explain the purpose of this PR and the problem it solves.

Changes

• What was changed and why
• Any notable design decisions or trade-offs

Type of change

• Bug fix
• Feature
• Refactor
• Documentation
• Chore/CI

Affected areas

• Core (Go)
• Transports (HTTP)
• Providers/Integrations
• Plugins
• UI (React)
• Docs

How to test

Describe the steps to validate this change. Include commands and expected outcomes.

# Core/Transports
go version
go test ./...

# UI
cd ui
pnpm i || npm i
pnpm test || npm test
pnpm build || npm run build

If adding new configs or environment variables, document them here.

Screenshots/Recordings

If UI changes, add before/after screenshots or short clips.

Breaking changes

• Yes
• No

If yes, describe impact and migration instructions.

Related issues

Link related issues and discussions. Example: Closes #123

Security considerations

Note any security implications (auth, secrets, PII, sandboxing, etc.).

Checklist

• I read docs/contributing/README.md and followed the guidelines
• I added/updated tests where appropriate
• I updated documentation where needed
• I verified builds succeed (Go and UI)
• I verified the CI pipeline passes locally if applicable

[coderabbitai]

Warning

Rate limit exceeded

@akshaydeo has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 10 minutes and 40 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 8dbf143f-6097-4949-99db-68211f927308

📥 Commits

Reviewing files that changed from the base of the PR and between 9b70c15 and c5ba281.

📒 Files selected for processing (12)

• framework/configstore/rdb.go
• framework/configstore/store.go
• framework/configstore/tables/virtualkey.go
• transports/bifrost-http/handlers/governance.go
• ui/app/_fallbacks/enterprise/lib/store/apis/accessProfileApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/app/workspace/virtual-keys/views/virtualKeyDetailsSheet.tsx
• ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx
• ui/components/ui/combobox.tsx
• ui/lib/store/apis/baseApi.ts
• ui/lib/store/apis/governanceApi.ts
• ui/lib/types/governance.ts

📝 Walkthrough

Walkthrough

This PR removes access_profile_id handling for virtual keys across backend and frontend: DB model, query params, handlers, TypeScript types, API calls, UI rendering, OSS fallbacks, and a small combobox prop cleanup.

Changes

Virtual Key Access Profile Removal

Layer / File(s)	Summary
Backend data model and validation framework/configstore/store.go, framework/configstore/tables/virtualkey.go	VirtualKeyQueryParams drops AccessProfileID; TableVirtualKey removes AccessProfileID and BeforeSave enforces mutual exclusivity between TeamID and CustomerID.
Backend query execution and handlers framework/configstore/rdb.go, transports/bifrost-http/handlers/governance.go	GetVirtualKeysPaginated no longer filters by access_profile; create/update request structs drop access_profile_id; handler parsing, validation, and update flows only handle team/customer and remove AccessProfileID persistence.
Frontend types and API layer ui/lib/types/governance.ts, ui/lib/store/apis/baseApi.ts, ui/lib/store/apis/governanceApi.ts	Remove access_profile_id from governance types and query params; remove "AccessProfileVirtualKeys" RTK tag; getVirtualKeys omits access_profile_id and conditionally adds exclude_access_profile_managed_virtual.
Frontend virtual-keys table and CSV export ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx	Remove access-profile name lookup; "Assigned To" and CSV export derive from team/customer only; export calls no longer pass accessProfileNames.
Frontend details sheet, OSS fallbacks, and cleanup ui/app/workspace/virtual-keys/views/virtualKeyDetailsSheet.tsx, ui/app/_fallbacks/enterprise/lib/store/apis/accessProfileApi.ts, ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts, ui/components/ui/combobox.tsx	VirtualKeyDetailSheet uses useVirtualKeyUsage for profile-managed state; OSS fallback removes GetAccessProfiles types/hook; ComboboxSelect drops optional data-testid prop.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

• maximhq/bifrost#3560: The main PR removes access_profile_id support (dropping VirtualKeyQueryParams.AccessProfileID and team/customer-only assignment/queries), which directly conflicts with and reverses the retrieved PR’s addition of access_profile_id to the DB model, request/response types, handlers, and query filtering.
• maximhq/bifrost#3487: Both PRs touch virtualKeysTable.tsx: the main PR removes access_profile_id plumbing (types/data fetching), and the retrieved PR’s VKActiveSwitch/action-disable logic depends on whether a key is access-profile-managed, so their changes collide on the same “managed-by-profile” UI behavior.

Suggested reviewers

• akshaydeo
• danpiths

Poem

🐰 Keys once tied to profiles, now set free,
Teams and customers hold the key, not three.
I hop and tidy code with a twitchy nose—
Simpler fields, fewer rows,
Hooray for clearer flows! 🥕

🚥 Pre-merge checks | ✅ 2 | ❌ 3

❌ Failed checks (3 warnings)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The PR description is entirely a blank template with no concrete content filled in; all sections are empty placeholders without implementation details, rationale, or breaking change information.	Fill in the Summary section explaining why this revert was necessary, populate the Changes section with specifics, mark Type of change, select Affected areas, document breaking changes, link related issues, and complete the Checklist.
Linked Issues check	⚠️ Warning	The linked issue #123 is about Files API support for providers; it is completely unrelated to the PR's objective of reverting access_profile_id from virtual keys.	Remove issue #123 or link the correct issue(s) related to the access_profile_id revert such as the original feature PR #3560 or any related tracking issue.
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly describes the main change: reverting a prior feature that added access_profile_id to virtual keys.
Out of Scope Changes check	✅ Passed	All code changes are directly related to removing access_profile_id from virtual keys across backend, transport, and UI layers; no out-of-scope changes detected.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch revert-access-profile-vk-assignment

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[CLAassistant]

All committers have signed the CLA.

[BearTS]

• fix: make virtual keys table fill available height with sticky header and scrollable body #3676
• fix: remove save/cancel icons and fix sheet layout growth in routing rule and virtual key sheets #3675
• fix: ensure toasts remain clickable above modal overlays #3674
• adds created_by for virtual keys #3672
• test: add v1.5.3 migration test coverage for feature flags, temp tokens, OAuth schema refactor, and new columns #3671
• chore: drop access_profile_id column from governance_virtual_keys #3670
• Revert "feat: add access_profile_id to virtual keys for direct access profile assignment (#3560)" #3669 👈 (View in Graphite)
• table updates #3665
• dev

This stack of pull requests is managed by Graphite. Learn more about stacking.

[greptile-apps]

Confidence Score: 4/5

Safe to merge for existing deployments, but will break fresh installs due to a stale migration call referencing a removed struct field.

The revert is well-executed across Go and TypeScript layers, but migrations.go still registers migrationAddVKAccessProfileIDColumn, which calls mig.AddColumn with a field that no longer exists on the struct — fresh installs will fail to boot.

framework/configstore/migrations.go — the stale migration call needs to be removed or replaced with a drop-column migration before fresh installs are safe.

Important Files Changed

Filename	Overview
framework/configstore/migrations.go	Migration runner still calls migrationAddVKAccessProfileIDColumn, which references the now-removed AccessProfileID struct field — fresh installs will fail to start.
framework/configstore/tables/virtualkey.go	Removes AccessProfileID field from TableVirtualKey and simplifies BeforeSave to enforce team/customer mutual exclusion only.
transports/bifrost-http/handlers/governance.go	Removes AccessProfileID from request/response types and handlers; update logic refactored from if/else-if chain to independent if blocks, logically equivalent given the mutual-exclusion guard.
ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx	Removes access-profile display and CSV export logic; dead accessProfileNames parameter left on virtualKeysToCSV.
ui/lib/types/governance.ts	Removes access_profile_id from VirtualKey, CreateVirtualKeyRequest, UpdateVirtualKeyRequest, and GetVirtualKeysParams.

_{Reviews (7): Last reviewed commit: "Revert "feat: add `access_profile_id` to..." | Re-trigger Greptile}

[coderabbitai]

Actionable comments posted: 1

🧹 Nitpick comments (1)

ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx (1)

66-66: 💤 Low value

Remove unused accessProfileNames parameter.

The accessProfileNames parameter is no longer used after removing access profile support. Clean it up to avoid confusion.

♻️ Proposed fix

-function virtualKeysToCSV(vks: VirtualKey[], accessProfileNames: Record<number, string> = {}): string {
+function virtualKeysToCSV(vks: VirtualKey[]): string {

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx` at line 66, The
function signature for virtualKeysToCSV still includes an unused
accessProfileNames parameter; remove that parameter from the function
declaration (virtualKeysToCSV) and any callers, and update any tests or
references to call virtualKeysToCSV(vks) with only the VirtualKey[] argument so
the code no longer accepts or expects the unused Record<number,string>
parameter. Ensure imports/exports and type annotations are adjusted accordingly.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@ui/app/workspace/virtual-keys/views/virtualKeySheet.tsx`:
- Around line 275-286: The effect is re-triggering because
form.watch("entityType") is called in the dependency array; replace this pattern
with a watch subscription: inside the component register a subscription via
form.watch((value, { name }) => { if (name === "entityType") { /* use
form.setValue to clear teamId/customerId based on value "none"/"team"/"customer"
*/ } }) and return the unsubscribe in the cleanup; remove
form.watch("entityType") from the useEffect dependencies and stop using form in
the dependency array so the logic lives in the subscription instead of a
useEffect that depends on form.watch. Ensure you reference the same symbols:
useEffect, form.watch (subscription), and form.setValue for clearing values, and
unsubscribe in the cleanup.

---

Nitpick comments:
In `@ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx`:
- Line 66: The function signature for virtualKeysToCSV still includes an unused
accessProfileNames parameter; remove that parameter from the function
declaration (virtualKeysToCSV) and any callers, and update any tests or
references to call virtualKeysToCSV(vks) with only the VirtualKey[] argument so
the code no longer accepts or expects the unused Record<number,string>
parameter. Ensure imports/exports and type annotations are adjusted accordingly.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e772ee92-3ba7-4106-bf60-45be693500f4

📥 Commits

Reviewing files that changed from the base of the PR and between 6ea298d and 7dbb0ce.

📒 Files selected for processing (12)

• framework/configstore/rdb.go
• framework/configstore/store.go
• framework/configstore/tables/virtualkey.go
• transports/bifrost-http/handlers/governance.go
• ui/app/_fallbacks/enterprise/lib/store/apis/accessProfileApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/app/workspace/virtual-keys/views/virtualKeySheet.tsx
• ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx
• ui/components/ui/combobox.tsx
• ui/lib/store/apis/baseApi.ts
• ui/lib/store/apis/governanceApi.ts
• ui/lib/types/governance.ts

💤 Files with no reviewable changes (7)

• ui/lib/store/apis/governanceApi.ts
• framework/configstore/store.go
• framework/configstore/rdb.go
• ui/lib/types/governance.ts
• ui/components/ui/combobox.tsx
• ui/lib/store/apis/baseApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@framework/configstore/tables/virtualkey.go`:
- Around line 246-253: In BeforeSave (TableVirtualKey.BeforeSave) normalize
blank owner IDs before the mutual-exclusion check: inspect vk.TeamID and
vk.CustomerID (pointer to string), trim whitespace and if the pointed string is
empty treat it as unset by setting the pointer to nil (or alternatively return
an error) so that the exclusivity logic (`if vk.TeamID != nil && vk.CustomerID
!= nil`) and subsequent persistence never allow an empty-string owner; apply
this normalization at the top of BeforeSave before enforcing the
team-vs-customer rule.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 2c6c577e-db31-43f0-95fd-4776b87bcd63

📥 Commits

Reviewing files that changed from the base of the PR and between 7dbb0ce and 9c71a91.

📒 Files selected for processing (12)

• framework/configstore/rdb.go
• framework/configstore/store.go
• framework/configstore/tables/virtualkey.go
• transports/bifrost-http/handlers/governance.go
• ui/app/_fallbacks/enterprise/lib/store/apis/accessProfileApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/app/workspace/virtual-keys/views/virtualKeySheet.tsx
• ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx
• ui/components/ui/combobox.tsx
• ui/lib/store/apis/baseApi.ts
• ui/lib/store/apis/governanceApi.ts
• ui/lib/types/governance.ts

💤 Files with no reviewable changes (7)

• framework/configstore/store.go
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/lib/store/apis/governanceApi.ts
• ui/lib/types/governance.ts
• ui/lib/store/apis/baseApi.ts
• framework/configstore/rdb.go
• ui/components/ui/combobox.tsx

[coderabbitai]

🧹 Nitpick comments (1)

ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx (1)

466-490: ⚡ Quick win

Remove stale CSV helper parameter to keep the contract aligned.

Line 66 still declares accessProfileNames, but both export paths now call virtualKeysToCSV(...) without it. Removing that parameter keeps this revert consistent and avoids confusion.

♻️ Suggested cleanup

-function virtualKeysToCSV(vks: VirtualKey[], accessProfileNames: Record<number, string> = {}): string {
+function virtualKeysToCSV(vks: VirtualKey[]): string {

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx` around lines 466 -
490, The file still declares a stale CSV helper variable accessProfileNames
(used as a parameter previously) but both export paths now call
virtualKeysToCSV(...) without it; remove the accessProfileNames declaration and
any related unused bindings so the code matches the updated virtualKeysToCSV
signature — search for and delete the accessProfileNames variable and any
references to it in this module (keeping handleExportCSV and the
virtualKeysToCSV calls unchanged).

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx`:
- Around line 466-490: The file still declares a stale CSV helper variable
accessProfileNames (used as a parameter previously) but both export paths now
call virtualKeysToCSV(...) without it; remove the accessProfileNames declaration
and any related unused bindings so the code matches the updated virtualKeysToCSV
signature — search for and delete the accessProfileNames variable and any
references to it in this module (keeping handleExportCSV and the
virtualKeysToCSV calls unchanged).

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: aba7ae9c-77c6-4a9d-b56e-ac6c7c2bb048

📥 Commits

Reviewing files that changed from the base of the PR and between 9c71a91 and 46d0f0f.

📒 Files selected for processing (12)

• framework/configstore/rdb.go
• framework/configstore/store.go
• framework/configstore/tables/virtualkey.go
• transports/bifrost-http/handlers/governance.go
• ui/app/_fallbacks/enterprise/lib/store/apis/accessProfileApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/app/workspace/virtual-keys/views/virtualKeyDetailsSheet.tsx
• ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx
• ui/components/ui/combobox.tsx
• ui/lib/store/apis/baseApi.ts
• ui/lib/store/apis/governanceApi.ts
• ui/lib/types/governance.ts

💤 Files with no reviewable changes (7)

• ui/lib/store/apis/baseApi.ts
• ui/lib/types/governance.ts
• ui/lib/store/apis/governanceApi.ts
• ui/components/ui/combobox.tsx
• framework/configstore/rdb.go
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• framework/configstore/store.go

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@transports/bifrost-http/handlers/governance.go`:
- Around line 476-481: The branch that decides between GetVirtualKeysPaginated
and GetVirtualKeys ignores requests that only set order (e.g., ?order=desc);
update the condition that currently checks limitStr, offsetStr, search,
customerID, teamID, sortBy, isExport, and excludeAccessProfileManagedVirtual to
also include order != "" so that ordering-only requests route to
GetVirtualKeysPaginated; locate the variables sortBy and order and the call
sites of GetVirtualKeysPaginated / GetVirtualKeys in governance.go to make this
change.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: f29bc301-301d-42a2-af38-02acfb26c0df

📥 Commits

Reviewing files that changed from the base of the PR and between 46d0f0f and 40426e2.

📒 Files selected for processing (12)

• framework/configstore/rdb.go
• framework/configstore/store.go
• framework/configstore/tables/virtualkey.go
• transports/bifrost-http/handlers/governance.go
• ui/app/_fallbacks/enterprise/lib/store/apis/accessProfileApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/app/workspace/virtual-keys/views/virtualKeyDetailsSheet.tsx
• ui/app/workspace/virtual-keys/views/virtualKeysTable.tsx
• ui/components/ui/combobox.tsx
• ui/lib/store/apis/baseApi.ts
• ui/lib/store/apis/governanceApi.ts
• ui/lib/types/governance.ts

💤 Files with no reviewable changes (7)

• framework/configstore/store.go
• ui/lib/store/apis/baseApi.ts
• ui/app/_fallbacks/enterprise/lib/types/accessProfile.ts
• ui/lib/store/apis/governanceApi.ts
• ui/components/ui/combobox.tsx
• ui/lib/types/governance.ts
• framework/configstore/rdb.go

[coderabbitai]

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Honor order-only virtual-key list requests.

If a caller sends only ?order=desc, Line 481 falls through to GetVirtualKeys and silently ignores the requested ordering. Include order != "" in this branch condition so sort-direction changes still use GetVirtualKeysPaginated.

Suggested fix

-	if limitStr != "" || offsetStr != "" || search != "" || customerID != "" || teamID != "" || sortBy != "" || isExport || excludeAccessProfileManagedVirtual {
+	if limitStr != "" || offsetStr != "" || search != "" || customerID != "" || teamID != "" || sortBy != "" || order != "" || isExport || excludeAccessProfileManagedVirtual {

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	sortBy := string(ctx.QueryArgs().Peek("sort_by"))
	order := string(ctx.QueryArgs().Peek("order"))
	isExport := string(ctx.QueryArgs().Peek("export")) == "true"
	excludeAccessProfileManagedVirtual := string(ctx.QueryArgs().Peek("exclude_access_profile_managed_virtual")) == "true"
	if limitStr != "" || offsetStr != "" || search != "" || customerID != "" || teamID != "" || accessProfileIDStr != "" || sortBy != "" || isExport || excludeAccessProfileManagedVirtual {
	if limitStr != "" || offsetStr != "" || search != "" || customerID != "" || teamID != "" || sortBy != "" || isExport || excludeAccessProfileManagedVirtual {
	sortBy := string(ctx.QueryArgs().Peek("sort_by"))
	order := string(ctx.QueryArgs().Peek("order"))
	isExport := string(ctx.QueryArgs().Peek("export")) == "true"
	excludeAccessProfileManagedVirtual := string(ctx.QueryArgs().Peek("exclude_access_profile_managed_virtual")) == "true"
	if limitStr != "" || offsetStr != "" || search != "" || customerID != "" || teamID != "" || sortBy != "" || order != "" || isExport || excludeAccessProfileManagedVirtual {

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@transports/bifrost-http/handlers/governance.go` around lines 476 - 481, The
branch that decides between GetVirtualKeysPaginated and GetVirtualKeys ignores
requests that only set order (e.g., ?order=desc); update the condition that
currently checks limitStr, offsetStr, search, customerID, teamID, sortBy,
isExport, and excludeAccessProfileManagedVirtual to also include order != "" so
that ordering-only requests route to GetVirtualKeysPaginated; locate the
variables sortBy and order and the call sites of GetVirtualKeysPaginated /
GetVirtualKeys in governance.go to make this change.

[akshaydeo]

Merge activity

• May 21, 9:21 PM UTC: A user started a stack merge that includes this pull request via Graphite.
• May 21, 9:23 PM UTC: Graphite rebased this pull request as part of a merge.
• May 21, 9:23 PM UTC: @akshaydeo merged this pull request with Graphite.