etxt edit
Merge branch 'hotfix/edit_text'

* hotfix/edit_text:
  etxt edit