Hotfix: install fails -.-
Merge branch 'dev'