Improved parsing of free text

Change-Id: Id2246428b17608c7ae3b562d935cf9307f8181fe
Merge "Improved parsing of free text"