Merge "Update Model to allow Persisting of alternateId"