Planned, but not relevant to this change + V1 is still fully functionnal, and "might" become handy, if we screw up V2.