Merge "Fixed header in file history"