Merge branch 'hotfix/1.7.8'
Finally fixed!
Merge branch 'hotfix/1.7.9' into develop