This commit also modifies the Router serialization to persist the MPP struct when present, and properly restore it when loading from disk.
This commit also modifies the Router serialization to persist the MPP struct when present, and properly restore it when loading from disk.