DF-5048 fixed save/load prototypes