Merge "Fix bug in manifest metadata handler"