Merge branch 'text-parser-improvements' into next