Merge "Add command to fix/generate idempotent IDs"