Please ignore the changes to the XSData files as they are automatically generated (just tweaked a bit manually)