Merge branch 'hotfix'
Merge branch 'develop'
clean file
merged mannually