Ticket/12662

Reorganize Header