B-55702 header normalization port to spock