Tidy up and add zone serial number
Update distribution POM