Merge "Initial implementation of the new Save APIs."