This is a separate feature, unrelated to system versioning

We may keep it or not, but either way, it's a separate discussion,
if we keep it, it won't be in the system versioning branch