Merge "Revert "Don't add other's child as header or footer"" into oc-dev