Added trademark
Merge branch 'hotfix/trademark' into develop