Merge "Fix sub header string"