Merge "Fix header not set on initialization" into oc-dev