Merge change 8253

* changes:
  Update the current.xml error message.