Merge "Split loading process for battery header" into oc-dev