Merge "Start paving the way for XMP metadata."