Reintegrate header-work branch. Important changes include continued work on headers...