Merge Dan Wells' changes to the serial schema from the