Merge "Fix XMP parser errors due to trailing nullchar"