Merge branch 'feature/install' into production
Merge branch 'issue/239' into production
Merge branch 'issue/240' into production