Add ifndef statements to halo
Merge branch 'hotfix/halo-check-options'