FLUID-4947: added some fixes to text split and error handling.
Merge remote-tracking branch 'yzen/demo' into demo

* yzen/demo:
  FLUID-4947: added some fixes to text split and error handling.