Added some fixes resulting from production test of the new string parser
Authored by: numere 2017-05-31
Parent: [r132]
Child: [r134]