some formatting (backported from 8.6)
merge-mark