Merge branch 'hotfix/halo-string-comparison'
Add ifndef statements to halo
Merge branch 'hotfix/halo-check-options' into develop