Merge "Extracting format string properly into xml strings."