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