Preserve exception cause in LockBasedStorageManager
Check header kind when deserializing from class files
Buildserver auto merge