See: #367
Use modified upstream saveload implementation for these versions Re-arrange headers to support multiple saveload implementations