Savepoint deserialization fixup - The class is an inner class, but not statically accessible.

Savepoint deserialization fixup - The class is an inner class, but not statically accessible. #21785