Merged in alt-dispatch changes