Merge branch 'feature/fix-installer' into develop