Merge "Fixed SaveInfo setup."