Further improvements to the freetext regex to remove unprintable chars
Merge branch 'hotfix-2.3.4'