SWC-799: rework header