Reorder wizard agreement
merged