Merge pull request #3226 from kkhoot/clean_header