Merge.
Reversed the damaged files in mzos repository.
Re-merge.