Further improvement to the string handling.
Merge branch 'Stringhandlingchanges' into develop

Improved stringhandling.