Merge branch 'hotfix/shariq-text'
Oops forgot this for Shariq also.
Merge branch 'hotfix/shariq-text2' into devel