case 2862 - Change the way of escaping of some characters.
Merge branch 'case-2862' into develop

* case-2862:
  case 2862 - Change the way of escaping of some characters.