@nickb before repackaging it would be good if you can review the changes (first two sections, and the last section).