Merge "Allow writing a NoteMap back to the repository"