Merge "Fix header protection interactions" into sc-dev