message update
Merge branch 'hotfix/txt-update-2'