Merge branch 'hotfix/slash'
changed
Merge branch 'hotfix/slash2' into develop