Merge "Add some missing conversation log fields"