Merge "Refactor off COW header v3" into main