Merge "Mark consistently with any edit summaries"