Reintegrate header branch part 6/x