[PATCH 0/6 conductor] Integrates new common header