CB-5130: starting work on header