Merge "Update XMP metadata"