[BrdlfCmmrc]header refactor [hareesh]