Added the fast path cancel patch...
Merge branch 'fast-path-cancel'