ref: refs/heads/8699-edge-redirect-flow-to-active-stack
