Pull in router fix for missing headers