Merge "Only add header when description not already has it"