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