Add missing conditional compiler directive
Place compiler directive correctly
Merge branch 'master' into CodeBetterBuildServer