Merged in the untested V2 PhantomX changes into Quad version