Merge "Make grant origin tracing more ergonomic"