Merge "Fix Manifest.MF"