Merge change 22040 into donut

* changes:
  Fix broken XML generated during "Extract string"