<bugfix/textexpand> fix bug with incorrect text expand
<stable/0.1> Merge branch 'bugfix/textexpand' into stable/0.1