savedata
Merge pull request #6969 from daniel229/savedata

Savedata minor