Merge "Avoid infinite loop for invalid XML format" into sc-dev