Merge branch 'feature/install' into production