Merge branch 'hotfix/windows'
removed demo
Merge branch 'hotfix/remove_symlink' into develop