Merge branch 'hotfix/git_dist'
remove dist
Merge branch 'hotfix/back_dist' into develop