This will land in 1.4.0 not 1.3.x as there may be minor incompatibilities (if major we should consider 2.x) At this point we should undo #819