Upstream change: Add global index directive