MOB-440 : support for white spaces in non-console mode