Changes to installer
Troubleshoot compiler error after merge
Merge branch 'origin/develop'