Merge "Improvements to tombstone output."