Merge save game

Starting work on merging save game into 038 patch, to be merged into 039 dev